Merge "Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c3024 am: 1d4959b110 am: 6fcdf94948" into rvc-qpr-dev-plus-aosp