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

Change-Id: I80369f3dadcaf0e3c5fea708f26d5a68011001f8