am 4fc84091: Reconcile with ics-mr1-release

* commit '4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31':