am a4b72c9f: Reconcile with ics-mr1-release

* commit 'a4b72c9fe4ea6e984440d67538eee26fdb140d8d':
  IML81