am 5c8e0271: DO NOT MERGE. Cherry pick \'Support multiple notAnnotation values\'

* commit '5c8e0271db889518f5969b142a37faa01a4ee54d':
  DO NOT MERGE. Cherry pick 'Support multiple notAnnotation values'