Merge changes If4deb106,Ib25d7658 am: 0388f0e47b am: 41a57af66a
am: ae278410f5

Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
tree: 694f6a8cefa0bef935ff31de7524a549766df015
  1. core/
  2. services/
  3. tests/