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

Change-Id: Id170ac291830118750ec4f5858ce87676919afeb