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

Change-Id: I91d4620e18075a93f656a212293cbcd2e8c7cca7