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

Change-Id: I0ac0df9994b849a3134e6c44d417b8ee750937ef