Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
am: e22193d8a9

Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
tree: cde47453bd5fdf99198eede077265d69ef5cb904
  1. core/
  2. services/
  3. tests/