Merge changes If71fadd2,I42047185
am: 2b428221cb

Change-Id: Ie15258f09adb7f1cc53c558e1d3d5fdaf8d93476
tree: dee1c4aabcbacb401c8cb9a9f5b034b127ef87d4
  1. core/
  2. services/
  3. tests/