Merge "New generic intent for SIM Activation"