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

Bug: 120848293
Change-Id: I9b7f26033851c9cc1a0f2519aacec95b2033303f