Merge "Ensure partition_tag is always set correctly"
am: dcbc2e9a26

Change-Id: I446d0eecd17c19fade90dd4b7e7a195f2a3d1d5a