Merge "Wire up the stopRtt API" am: 9358dee245 am: c0c4a2f12b
am: 46858aa544

Change-Id: Id5df59314f69c6ef52f1594605eff099e170ebe6