am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
tree: a79f59b4e9af56f4d580b54e7cc41bac207fc89d
  1. core/
  2. services/