Merge "No longer using specific watch device idle settings" into oc-dev
am: 8bde47ae82

Change-Id: I04c8d9b4897cbd9ae4c2ae21439ae3d8ca0024a0
tree: 58fd26d3d07f3b05d3efcf47f02c36b4c05e81ff
  1. tests/