Merge changes I720a1feb,I9539b8cc,Ib79b777b
am: 230687643c

Change-Id: Ieaa1371f6e52074b76e3353ea9a2653c783ff04e
tree: d83c9ef21fb047f45cb5e4a7b3fba6c65ff2afed
  1. core/
  2. services/
  3. tests/