am f209f573: am 77b2771b: Reconcile with ics-mr0-release

* commit 'f209f573e3d9e7075e0337875cee367e0c4bc180':
  ICL48