Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release

Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76
tree: 2b0677f9bd5dce7f11ad38a7c88df874699229c8
  1. core/
  2. services/