Merge changes I2ddfef0c,I49bee0c9
am: 1feafc2e2a

Change-Id: I54b43a6fe240d00d0e530a8777bdb9f452a2b539
tree: b49314204b051bd79e5bb7f0320d3cff6aa8a26f
  1. core/
  2. services/
  3. tests/