am 26bec4db: am adb70c57: Reconcile with ics-mr0-release

* commit '26bec4db6139e30dd35b5cb200f05934c5610c5f':
  ICL31
  ICL30