Merge "Wire up the stopRtt API" am: 2d82493ded am: c7d6900e49
am: 41535c78be

Change-Id: Ia5e8888fbdff213167f031d221f301d5c4659cfc