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

Change-Id: I5a8ede84a1b45764389a09127708283f5479bde5