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

Bug: 120848293
Change-Id: I998944a84544d0530fd29264e87b14565ba4df0b