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

Change-Id: I46f8f4bdfea7ae4f75119226cbaa100365a260db
tree: 1ac9b99f49d695b0eaf38f9a64f6bb2242099fbd
  1. tests/