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

Change-Id: I77598bb8449c8b4b83e93453dd46a658af66bab1