Merge "Move logcat call to ExecutorService" into tm-dev