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

Change-Id: Ib381d33312e633b90574e8c43a54b32beecd2c6a