Merge "Fix bug that was failed to create Null annotations."
am: 5e9e1f9e86

Change-Id: I3f987e6ea9520693b9b3927cdbbbddd028af2a5a