Merge "add NonNull and Nullable annotation to APIs"