Merge "Mock out AsyncRingtonePlayer during Testing" into nyc-dev