Merge "annotation part 2" am: cce67beec6
am: 498953b1ab

Change-Id: If7f6b1dfc60825e2e2cc29fb44d5dca644712764