Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 3ee5c80eef am: 6be9b5f9ee

Change-Id: If8abb4247759462532cbac6b43bfb8d3202c6e34
tree: 9fc74d8204b8019d919c50ccb848a29374893d7d
  1. core/
  2. services/
  3. tests/