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

Change-Id: I20237f6890b5b0ef0aca261f0c4d8ed6138576cc