[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 0eb96664 -s ours am: 42867168 -s ours Change-Id: Id8c0624220fad36c72ceedbc6b540bb34bd60e7f