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

Change-Id: I06197ba5d5197f9661de1aae4da5683ea147b13c