Merge "Fix wait_for timestamps in Sensors VTS" into qt-r1-dev am: 29c8337d89 am: 1cc1242cbe
am: 5c01e510bf

Change-Id: I13c0341cdeb0c90a16fb43b8cf005f015de5cd45