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

Change-Id: I0877d90021b8f480b79b7f648672125f7192efca