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

Change-Id: Ie0270c40ec0947a04feeafc13a5e94cad2358cd8