[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 80e9b9bac7  -s ours
am: 16e513db30  -s ours

Change-Id: I1844285e085d85a128f86266211f97884c5db16e