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

Change-Id: I32ab3dfc2f403c552672d77dc77d2c768536bec3