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

Change-Id: I3fd66311bb7f1c7a74d7f8e7b1e2c0ea8aec5325
tree: 609a41cdaf1b2e8ff432a1aaa8ac8785446c6342
  1. tests/