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

Bug: 120848293
Change-Id: I38a08d56c2d77acb4581a5ae4312a25ed17ad9ea