DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I7284b077ac2e72dde48048bdaa3575117bd79ffb