am: e2c27eed -s ours * commit 'e2c27eed': DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.