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

Change-Id: Idab2d4174aa3d6a19f9573edf0d5ee3ecfa33201