am 6c49ee03: am 0f3e201a: Reconcile with ics-mr1-release

* commit '6c49ee0370af045b165340a1f18b42e55a990928':