Merge "Correct nullability and final constraints on new APIs."