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

Change-Id: I38ba2475475e4d5a19dc44f22ed30304deec6d06