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

Change-Id: If3b4a8fabee7b9b74e345d59505040e45588f9e7