Merge "Add method to enable adb root and related refactoring."