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

Bug: 120848293
Change-Id: I975363c5308bea7032d3f45c2d726656e1a7a492