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

Bug: 120848293
Change-Id: I4f95a724133615db8b050a824e5cbcb11214d89d