Merge changes I303d1102,I72c9aa43,If13a5284 am: 1aaf45bf89 am: 5001af80ff
am: bb119158f9

Change-Id: Iad1030a22f25bed92bd9d504fb1a40fc1e1cfdc5
tree: 0168b4ef8b31b90737a60bfdbe9f18cf3ca80d0e
  1. core/
  2. services/
  3. tests/