Merge "Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e553 am: a65a36bfb5 am: b9caacda84" into rvc-qpr-dev-plus-aosp