Merge "Ensure phone state broadcast does not include 3p app addresses." into pi-dev