Changes to sync with ADB Office