[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: d3b1d41424  -s ours am: d3d7818495  -s ours
am: 8c733190af  -s ours

Change-Id: Ib8990f66fcc776c7988e2e7fe06139150d13465c