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

Bug: 120848293
Change-Id: I37b3d38fad900089559d24a1ff3d9cd76e28414f