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

Bug: 120848293
Change-Id: I2dfa9bf455e7cc5f0c0ec374d9e2422fca8857e9