Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev