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

Change-Id: I4c7bde2519cbfa417414cdf6a5f105dc69b6c629