Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82 am: eb2c021f93
am: 94206d5cad
Change-Id: I792e119f426dc61d3e1db73ecfcb040e9834fd81
This commit is contained in: