Merge "Add NonNull and Nullable annotations"