Reconcile with ics-mr1-release

Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
tree: 0cfdd626a39c21fd4940c7f5524a202ec92ab21a
  1. core/
  2. services/
  3. wifi/