am adb70c57: Reconcile with ics-mr0-release

* commit 'adb70c57c265f8e4e1f2306d5d91025a0683347e':
  ICL31
  ICL30