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

Change-Id: I6abd13b516cc7176974403260961668e1b753643