Merge changes I4f181789,Ia8a0c99b
am: f7d42a0a3c

Change-Id: I50207fe29953be7759bbd01cb93268202067f764
tree: aa2460d02cff1deb0a86364bb152dc4940f26d88
  1. core/
  2. services/
  3. tests/