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

Bug: 120848293
Change-Id: I8d0d20b0b9d61d060b4565d9a82408810abe9774