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

Change-Id: I9eb1bf07cd24821c999cdb31a7d7f51ca7ffc85c