Merge "Fix checkstyle errors"
tree: f3f5d7ae5ad15aeca345b7c88636e788bd7f8a79
  1. service/
  2. tests/