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

Change-Id: I938e2eb22971b0d54ba597a76de9b69e2c1e6bba