Merge "Add NonNull annotation"