Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev am: e2c27eede5  -s ours
am: 44b73f54fb  -s ours

* commit '44b73f54fb223538eb05fe7b86ff0f47c117be7e':
  DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.