Merge changes I446a8595,I68d2293f am: 0561b934dc am: 54e08a83e9

Change-Id: I27a4344fa2e3b91fe31e02bf41f20a2bc11c2ff6
tree: 0d02da06252d71eb9f79ef72a2308cc9e138282b
  1. core/
  2. services/
  3. tests/