Merge "Revert "Revert "Telephony light grey list clean up for Q"""