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

Bug: 120848293
Change-Id: I862ca7a02181176e8c68b13fefd680df8d42a7a9