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

Change-Id: Icc624d79757b3928ca4daa4756ca1e1122934274