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

Change-Id: Ia2855aa2ee622ec7901ed9129d27d141bf0c7b22