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

Change-Id: I518331e8c9f0b24389994f7fb8e81b85d580aabf