Reconcile with ics-mr0-release ics-mr1-release

Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
tree: 2c7f0cfcb842a5f65f1081f5786908ed1286642e
  1. core/
  2. services/
  3. wifi/