Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am: 6c232ced93 -s ours
am: 4149337a7a -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: If63db4e9d0435c13592835f424dcda31810e48e8