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

Change-Id: I40024f4a6539130aa9395d6a923a57cd5fe49960