Use proper methods for detecting data type in getAnnotationIndexesFromOffset

Change-Id: Ib0c11fb20a733ef8795729cc34656309903466aa
Merge "Use proper methods for detecting data type in getAnnotationIndexesFromOffset"