Merge "Fix build warning; LOG_TAG was misplaced"