Merge "Merge commit '6bb98d85' into manual_merge_6bb98d8"

                            UsbManager.removeFunction(persisted, UsbManager.USB_FUNCTION_MTP));

                }

                String buildType = SystemProperties.get(BUILD_TYPE_PROPERTY);

                if (buildType.equals(BUILD_TYPE_USERDEBUG) || buildType.equals(BUILD_TYPE_ENG)) {

                    setAdbEnabled(true);

                }

                setEnabledFunctions(null, false, false);

                String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();