Merge "Revert "Revert "Revert "Correct nullability and final constraints on...
Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f0 am: 08bc7171
am: 53179125
Change-Id: Idab2d4174aa3d6a19f9573edf0d5ee3ecfa33201