am 082ea423: am 49826d43: Reconcile with ics-mr1-release

* commit '082ea4230f5892379cb0eebfd87d1594e51987ec':
  Patch 2 for MR1.
  Patch for MR1.