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

Bug: 120848293
Change-Id: I9fc929b121a598c22d767d9ec3dec635214e7308