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

Change-Id: I0266ed4a31a3bc6e1978b20cfd958dbb7e663950