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

Change-Id: I9ac3216ba093a035ab5ab2c4a6eb77efbb7c8416