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

Bug: 120848293
Change-Id: Iaaaf3b7106f96ced6cc11cc79ab721611a9c15b3