DO NOT MERGE. Cherry pick 'Support multiple notAnnotation values'

Bug 12208088

Change-Id: I7e79220ba1572baf1851687f44e3bf635367853f
1 file changed