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

Bug: 120848293
Change-Id: I4eb3ea8a17ce2d5ee5f3a62f4f6c0a6c205b3687