am 5927015b: Reconcile with ics-mr1-release

* commit '5927015bba1f10f38de818f366c398c2444aff43':