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

Change-Id: I45f11b482ae26f7b30fbd394814da1f64c2d91eb