annotations

Change-Id: I3005a90aabdc787a83b039d55aea9077eff8ba1b
Signed-off-by: Guillermo Ontanon <guillermo@midokura.jp>