Merge "Update nullability of api" am: 47890345d0
am: 434096edef

Change-Id: If4e283682ec64eabb7f85421b275bf0424df9355