Merge "Revert "Move base resources to telephony""