Merge changes Ibcb91105,I0218f367
am: 6a5c545890

Change-Id: I4972d42657aa118e17240546c223723ed7b546ec
tree: c03110393e4ab6438d2fb6aa59b9c60b2139264f
  1. core/
  2. services/
  3. tests/