Update for com.android.mms case