Merge "Add nullptr check to CreateAnnotationSetItem."
am: ee883219e3

Change-Id: If325a9ee4b767e6b637674480fdb17ea51b578ed