Reconcile with ics-mr1-release

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