[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: ba0cdcdd -s ours am: 43645ca4 -s ours Change-Id: Ib06c10c7fa0c612cf4ee16567d7346036e801cbe
mentioned in commit fc6c3307