Merge "ADB security logging"