Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82 am: 940696d63a
am: be05af9c47
Change-Id: I71e87666a001ad2016ab29e3f6171220ffe91fdd
This commit is contained in: