am 4fc484a7: Reconcile with ics-factoryrom-release ics-mr0-release

* commit '4fc484a7fe8ed6841848b8ce4a1142eee417b84d':
  ICL24
  ICL23D
  ICL23C
  ICL23B
  ICL23
  ICL22
  ICL21C
  ICL21B
  ICL21
  IFL10F
  ICL20C
  ICL20B