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

Change-Id: I39a1f004d13dc9abf004205dde0a3d2f1cf21f9b