Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am: 004027ac60 -s ours
am: 3d3e6be52c -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I7cbefdd87f5a5ad71c06e97bef73095cad983a02