Merge "annotation part 2"
am: cce67beec6

Change-Id: I60108710a974d543849a6065f4d0dc2dc4a3b297