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

Change-Id: I1a2b4afeba6721f9f66f968a3eefe949f47622f5