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

Change-Id: I96b9306576ba0a00cc05883dcf16ff4292663483