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

Bug: 120848293
Change-Id: If3932ab0f6716b8df130153b6f92c0a5a13f59f1