am 113986be: Reconcile with ics-mr1-release

* commit '113986be4f8bc71da5d30520bb7095b70eeb72d5':