Turns out this was actually a bug in addAnnotationsToData() Change-Id: I0c9da662c091811e4053ab0ea2771c4a20b26e09