am 1ca1730b: Reconcile with ics-mr0-release

* commit '1ca1730b88e45d39c9211793d133cae148b134a1':
  ICL49