Merge "Tweak logcat parameters"