[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: f387ac20cd  -s ours
am: 317e5f1d75  -s ours

Change-Id: Id2c7871e6b5689e9f45e9384060fcf7f8b1db4b1