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

Change-Id: I9632fff744a8a226304f0e195464811718cd5977