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

Change-Id: I425c3c5cc8d042ac822351d7a395922048eae0f8