[automerger skipped] Merge "annotation part 2" am: cce67beec6 am: 498953b1ab
am: aacd55fb83 -s ours
am skip reason: change_id I5ce7f1527c250b85b11b5d4bdf86b65c31816f62 with SHA1 785d0382fa is in history

Change-Id: I8e897e61273db7cd030943c103c3e94a86df9d75