Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
am: 704a627973

Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081
tree: 3204631ec4e76ddd80eab690f62901e4d349befe
  1. core/
  2. services/
  3. tests/