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

Change-Id: I0e1109f3c7964faed25b0be347470bd3298a28d7