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

Bug: 120848293
Change-Id: I9e71456075d1dcbb37419b451cb48e89e1c8e4c6