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

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