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

Change-Id: I2ece99be8f7ff1c9b27bd195a6a5589ee1614d6c