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

Change-Id: I1a616529fceeef3ab17ce9f3c5197e39d1cef27b