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

Change-Id: I394ac0558f5d9e560375a597f47173e51aaeb690