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

Change-Id: I7ab41019aaf7babb7110eda06c80acbf1d8f025a