Merge ad546888608e45aa5bdba1167c6f5f7244a2a05c on remote branch

Change-Id: I460b3503a83546a6b22768bbdc29ad122f30b17b
tree: 4d5f9938e09385ef0dec8525050fe725abcad7c3
  1. service/
  2. tests/