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

Change-Id: I3bb745efc99b625d2a2dbb3fa29e3a21025dc48c