more annonations

Change-Id: I07744978741b5313e6a03b450612c16c74b26335
7 files changed