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

Change-Id: Id7d4c07bf83164ab6745c0d162d36ed457cef09d