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

Change-Id: I812c82732fda978e1f36ceec4a705471fbe335f8