am 4cab4e2b: am cb37e715: Refactoring plugins to use new java interfaces.

Merge commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0'

* commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0':
  Refactoring plugins to use new java interfaces.