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

Change-Id: I2e6cff50044c64e74e409ca522d44dd4d02bddbb