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

Change-Id: Ic424c40c3030ccef78ba2970ef91b4297ec0265a