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

Change-Id: Ideadf53295f45074e8bd0fff32247d8dc2db7f5f