Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: 91d3912eab
am: 004939fd82

Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3
tree: b411296f0761ebacde72a08631dfcfbc4cc76261
  1. core/
  2. services/
  3. tests/