Patch1part2

Part 1 for these commits can be found at packages_apps_Phone. Had to send these here since there is no jellybean-legacy branch for Phone.