Updated @NonNull + @Nullable annotations.
Merge branch 'develop'