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

Bug: 120848293
Change-Id: I64cd590cbd0f2b9abc6ad8e70d2cd8a9bade99fa