Merge 6b739dc7 from gingerbread

Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
tree: b1d96f14f68cbe7c1e5df67808de3488070eb72b
  1. core/
  2. services/