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

Change-Id: I7b9eceb8b5f47f6ed1ca4a35fe1d2f560e7d17dd