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

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