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

Bug: 120848293
Change-Id: I577315b483d82d280ab26f70cab5fecc03e15581