[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 101c35ab6d  -s ours
am: 58022b7618  -s ours

Change-Id: I9ade0fc74746b738626de5c762f26bf61999722a