Fixes for Phone.apk and other changes