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

Change-Id: I4e4304d169a2f7fc4c772d0170f9b1f5cc7e8fb0