Reconcile with ics-mr1-release

Change-Id: I75bc4cd928873b79be9bf0d8561f765f61e6fbde
tree: 27bcc9a67fada116af61673e5408adae5fb9094e
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/