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

Change-Id: Iff4af17accb81c3111c0a7517dfcb295858ad48f
tree: 504341752de206e67d2885cd46329cea8c9ef1e1
  1. tests/