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

Change-Id: I0cb7c7b31de2b2b82df66128565fa14051df77f5