am d2884199: Reconcile with ics-mr1-release

* commit 'd2884199bda058c13e79f01e9ece26c0334d1d9c':
  IML73