am 4f732584: Reconcile with ics-mr1-release

* commit '4f7325849bad0c41f451ab177bac037c20f00de0':
  IML74D