Merge "Removes UniversalSmartspace BroadcastReceiver." into rvc-dev