@NonNull + @Nullable annotation Updates.
Merge branch 'master' into release