Merge changes I446a8595,I68d2293f am: 0561b934dc

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