Merge "Ensure partition_tag is always set correctly" am: dcbc2e9a26 am: 9afd210a78
am: 4744c8e71d

Change-Id: I1af0d1ae3b8582fc55243edb243c63c048fcd302