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

Bug: 120848293
Change-Id: I502146af7ccfda13de8975f50cafcd31ff284673