Merge "Fix CLog to omit inner class name from tag."