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

Change-Id: I32d174056ef675be883922898dbdc6bc5a90ddc7