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

Change-Id: I124819fae9bbbafca6c66630561e0f61517de870