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

Bug: 120848293
Change-Id: Idee0008b06884476fcb1655a3ae2f9745873f7a3