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

Bug: 120848293
Change-Id: I8d3477a74075d761caddc4400d0ff9698845050c