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

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