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

Change-Id: I0b6131c959b80d7bb1c7d076ecb9b4d251d69ebb