am 5f301c85: Reconcile with ics-mr1-release

* commit '5f301c859abf1d697d7fcf55584a533539f9f95b':