Merge "Wire up the stopRtt API"
am: 2d82493ded

Change-Id: I720ec95129c7da6b0fbd802522f6b85f54de2f7b