[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 6550cab4ef  -s ours

Change-Id: I2143df19c215802dfb2a2688567b0f3e3d0880d3