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

Change-Id: I2a71a46d2e70d434281034ecbee2304d5091d586