am e02350e3: am 5f213f55: Reconcile with ics-mr0-release

* commit 'e02350e36475cbbb7a855e1268efb315df79e84f':
  ICL39