Merge "Fix bug that was failed to create Null annotations."