Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am: 84d4e535ae
am: fb5f0d1c37

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