am 5be1b1a2: Reconcile with ics-mr1-release

* commit '5be1b1a29507fe0aa09c30403b989a36077de0a7':