Merge "protected CARRIER_SIGNAL_RESET broadcast" into oc-dev