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

Bug: 120848293
Change-Id: I37e118b21cf92f66802cc9a11c440905ff24b7aa