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