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

Change-Id: I5ee92348f5707a6aaa3b89cc697e781e8be81b85