am 543bb7b0: Reconcile with ics-mr1-release

* commit '543bb7b0bdbfd230aa4d2c8849bac86dad2ec859':