Merge "incorrect dependencies and unnecesary export-package removed from pom.xml"