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

Bug: 120848293
Change-Id: I702c928fddd640ae08e5d14ff095aa4a203aa176