Reconcile with ics-mr1-release

Change-Id: I04db6f7d07f213a6dabec96efd393041f109e174
tree: acd36edcb44a548020883463379abfaa72d8a560
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/