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

Bug: 120848293
Change-Id: I1892413ed7341790edd8c4684e7754ee2514d0d1