Merge "Revert "Revert "Correct nullability and final constraints on new APIs."""
am: 86e2035208

Change-Id: I345e3f33e518373f787c0fb2c786a513e2dccd7d