Merge "Add nullability annotations"
am: 539821c978

Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d