Merge "Removing dead code from Telephony which uses wakelock."