Merge changes Ib328abd8,If75993eb into nyc-mr1-dev am: d5bfc592dd
am: bb85cf1b0f

Change-Id: Ib11c7fc2d8ee1c73ee8799cb3671baa50e8167ef
tree: 15536f1b9f32d19ed3becf7dc254d1d8dce9c5bc
  1. service/
  2. tests/