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

Change-Id: I09478ebd9ebc14cad529d11629a93649a9527b58