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

Bug: 120848293
Change-Id: I26a115428fbae78985ae0f2f38f53a277be2d2c9