DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I0e773537cbe882cea5cd8735f3d5f7fdc1d8d75f