Merge "Fix a failing test in AdbPreferenceControllerTest"