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

Change-Id: I255194bd89d51109eb2deaae7309eb3c2a94812d