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

* commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
  Add annotation support lib.