Mass merge from gingerbread - do not merge

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
tree: a05927daa315c5338b5424e1916c5a98272f9a13
  1. core/
  2. services/