Adds annotations in response to API feedback.

Fixes: 126699535
Test: is annotation change
Change-Id: Iba61b36386db78e568a5dfc5720646904c75b989
3 files changed