Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev