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

Change-Id: I073b465bea0cecc3c36576319e3840d9d76856ef