[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 14543d5be2  -s ours
am: d7a4fc3e99  -s ours

Change-Id: I30295ef77bb8264803709537c801a56c45b95ffb