am 57c5c01d: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread

Merge commit '57c5c01d5e725a913b24b3dedd9806240cbaf591'

* commit '57c5c01d5e725a913b24b3dedd9806240cbaf591':
  DO NOT MERGE Fixing Connectivity
tree: da84156d7b7579252106916f354c92c60c3b0108
  1. core/
  2. services/