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

Bug: 120848293
Change-Id: I3745e80584ff4733ba3214dc268aac8755ec26b5