Fix demo to convert annotation indexes to actual annotations

Change-Id: Ib9d4ab87baca2db7e9e8f2b9fc974c3198d9fe28
Merge "Fix demo to convert annotation indexes to actual annotations"