Merge 1d717314f5f1e8babcab7b4bf31a71d5e65fc452 on remote branch

Change-Id: I9692bf605426d9b36cb5451418e0cc4cc2c75aef
tree: b16f544835fd603cc6174f68de831ba57ae1dd96
  1. service/
  2. tests/