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

Change-Id: I484c60320e6dbce0afcca8f0acda668725107665