Remove "Messages" from the annotation module.

Change-Id: I6253fa192bb45fc06db99937aca30ee4dd0bb201
4 files changed