Merge "Correct nullability and final constraints on new APIs."
am: cdbfa9d087

Change-Id: I7c97b9b7929fa96109ffcb92cfd86c14a2aa41fa