Reconcile with ics-mr1-release

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