Merge "Improved error message when multiple annotations." am: 6d951e3a01
am: 9c3f3282c0

Change-Id: I9e5f3f08a9ba6a4496152ae44c97aacf9230ed98