Merge changes I98573a5c,Ic7394f24
am: ca3c2504b5

Change-Id: I2ffeb6ef1a19f7b2982c3631fe2c040024fb53cb
tree: ab41ca7ad26b4fa7ea30cc8ce08ecc91ac516938
  1. core/
  2. services/
  3. tests/