Reconcile with gingerbread-release

Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
tree: 69d8657aea8be67a1d2919664da2875b2c39393a
  1. core/
  2. services/