[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 783e8394b1  -s ours
am: ea2693c3ca  -s ours

Change-Id: I8f4c9c56a755289f05ee045df2cf256bb71acc70