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

Bug: 120848293
Change-Id: I699dc4c979ce47e2b399f160a6c04dfe2da8a09b