Merge "Moving classes used only by dialer into dialer package."