Merge "logcat: modernize the code"