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

Bug: 120848293
Change-Id: I53f248679f38594622cb055a7a85c3f17f06c246