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

Change-Id: I5c38019d99e6258002fb5017fdf88733b7d1ffe7