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

Change-Id: If6b5820503d48a488b41ee2269e54eb3a5b33aa6