am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev

* commit '7c629a728f628278986498060e649727cf5025fa':
  Add annotation support lib.