Merge pi-dev as of ag/4582919 into stage-aosp-master.

Bug: 112189069
Change-Id: I67297b2d6eb189283acb350c1001010f0e9c81d9