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

Bug: 120848293
Change-Id: I934a50a456613c3de8c8dbf902d622a3b1f06e16