Merge "Include CarrierDefaultApp to the img"