Merge "[RTT] Add API for number of measurements" into pi-dev am: d1c5b6695f
am: 80b9e35dce

Change-Id: I8070b2464da26a75a50d821746b6a181fb8ece91