am 1019e5a6: Reconcile with ics-mr1-release

* commit '1019e5a6af66a55346977e34f958fd241973eecb':