Merge "Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c30 am: 1d4959b1 am: 6fcdf949" into rvc-qpr-dev-plus-aosp