Merge "Refactored LogcatHelper and tests that uses it." into tm-dev