am 394b57e4: am aae29932: Reconcile with ics-mr1-release

* commit '394b57e4cc6fb93ef7238da8002d3aa0d1dcac3f':