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

Change-Id: Iae46ba235a37c670e37492a2447bbb40d2655b92