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

Change-Id: I0f2a84ae54c2fc272f857edb750c90aceadadfda