[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: fe4512e2 -s ours am: bfed746e -s ours am: e7c399b8 -s ours Change-Id: Ia6408ce9744ead11e3bf120ed800faf2c2a9c8f1
mentioned in commit 45fc78c1