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

Bug: 120848293
Change-Id: I96f59994f0406b279a3706e29bd06dd3959d5980