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

Change-Id: I9e3bcaf75ba1d8909d56abdfeef44613eb3ad3af