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

Bug: 120848293
Change-Id: I72e658583993a0da8f058d58854f9db7cddaf2f1