Significant modifications to expose annotations functionality through annotations API.

Change-Id: I6f0984f839b182f692c12b94909627fb11dc81fb