Merge "Added presubmit check to remove static imports from third_party java/"