am 77b2771b: Reconcile with ics-mr0-release

* commit '77b2771bd2bc26aefdf9ff3a3d96b54799185917':
  ICL48