am b5bd0a1b: Reconcile with ics-mr0-release

* commit 'b5bd0a1bc613fe018e37d9f96e94ad3044ea1815':
  ICL18
  ICL17B