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

Change-Id: Id5d80ce42ebd5d42eb046d00634977d665425d77