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

Change-Id: I40799671de955f7ee315859af708466e0aaa967b