Merge "Revert "Correct nullability and final constraints on new APIs."" am: 049867e364
am: 80379f24ec

Change-Id: I7cc4e604f65d8ba8e6ef28c488f5f248428498f7