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

Change-Id: I76eb7a9ac0c89b962241e4787a6306ad65e37792