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

Change-Id: If6f60350b9f14c3e5fd71a5ef8aadb01b66f9e1d