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

Bug: 120848293
Change-Id: I345e9a8cbcb3ebdc3da7be7494a7961810219fee