Merge "Port "Better ObjectIdentifier validation" change from openJdk8u121-b13"