Merge "Add NullFromTypeParam annotation"