Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" am: 86e2035208 am: 6ced2f195d
am: 8e6b20f4f3

Change-Id: I0aa41b4fc5d08201deffccdaa25c50ae7942fe78