Add annotations

Fixes: 126701951
Test: It builds, it runs!
Change-Id: Ia464beb7121efddd716d81b4b72a5a017fbd96aa
4 files changed