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

Change-Id: I1297211629a0a36fceeffcd4007d4295de383b74