Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am: 84d4e535ae

Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
tree: f8fed1b7ed37fb662edc3596a2ffa3026db6a928
  1. core/
  2. services/
  3. tests/