Merge 8a81f4dc8098635f9f84c4395999737760bc8ca6 on remote branch

Change-Id: Ica6821e3b55e9c43329f3cb8978a3134c0939a2b
tree: e38bb086e4493f9fbb1d403472a61a790faa6077
  1. service/
  2. tests/