Merge 7623e27cc5088e99675b2d14c7ab3eb1de82194e on remote branch

Change-Id: I7c9e9f526189bd3e27f0851402a32a3a01be9938
tree: 0097e610b979469c14bc9bacad2bcfeb269be744
  1. service/
  2. tests/