[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 680578ab -s ours am: db6ec712 -s ours Change-Id: I859324f19eb2af1f6ae7faaacb976fb4867c930a
mentioned in commit ad554cee