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

Change-Id: I04e184ee1b000261d45b8bdef8766054f5d53851