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

Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae