Merge "logcat: add sanity check"