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

Change-Id: I58d92bced62a7d460c57f8663a98bf9c61aee41a