Merge "Update Nullability of Apis"