Merge "Only update previous product config when changed" am: 2fcacb5a22 am: 5f381cfcb2
am: 8e77f86d58

Change-Id: Id86be7706a190b3264ba1aba4ce462cb785f15fa