Minor cleanups for annotation procedures

Change-Id: Ib09ac9a911e535070794f78ad023813ad192565c
8 files changed