am 90f2ee94: am 41f7d2d9: Reconcile with ics-mr1-release

* commit '90f2ee948bd834ac27977b0d7196e725b5123750':