Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs.""""
am: 0bbf61f024

Change-Id: I3f3572a23021ab173b38c3f04c43d8eb37706c26