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

Change-Id: I5bbd70d2f18e71f5135ca95a8a09627192e60933