Merge 207060fb734c28ddf4cef6f82c0c149febab5be3 on remote branch

Change-Id: I38a8166a902201fb955b44bc8821550ea1e979ef
tree: e1686dd6eadcb3ef0c941f4c8d113a4a0f6c0af5
  1. service/
  2. tests/