Merge changes I0613c23f,Ibeab8d0a,I8bd668ad,I7d3a16be
am: 604c2121a4

Change-Id: Ibe34e78e53a15e987042703fdd27d6393e4e7d59
tree: 3bfd47f043ceb41d9e12b0c863a7737a8697f61e
  1. core/
  2. services/
  3. tests/