Support annotations

Change-Id: I8592f5e89deb816cfe4d3b33ac03d8a0f94c76e8
(cherry picked from commit 3eb5e2b29e0ed87ecf1290953bd651761bd84028)
6 files changed