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

Change-Id: I23815b5b1a1e2538a86e560e2675df3d87825eb6