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

Bug: 120848293
Change-Id: I4ac82755aefae6a6240c7789c801d9754edfc2e3