Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev