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

Bug: 120848293
Change-Id: I3eff2efce14c84ce9f519d45553c0f87d2e0ae73