Merge "Re-apply GIT_COMMIT_ID check for checkpatch" into integration