Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev