[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 am: c19af4a907 -s ours am: 1da618f210 -s ours
am: ddc9e74a77 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I8bc4d659190a7f1e785c89131bf5dd741a72d5be