Merge "Add custom Error Prone check for SDK comparisons." into rvc-dev