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

Bug: 120848293
Change-Id: Ib22eacc336459e7545379f04c2812b89999473d2