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

Change-Id: I3cbf87dad3c0b9a874ce1cb003c03a41ec7ebee4