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

Change-Id: I781d960f513045bdf46e8ee6e2f613e8e0f5aa8a