Merge "Wire up the stopRtt API"
am: 9358dee245

Change-Id: I090f3c6094e14bb11bb076f2f933ef8c5dc4c883