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

Change-Id: I1322349b4b31775ac3f1163015918a3a80564887