am 7967e4c0: Reconcile with ics-mr1-release

* commit '7967e4c021b8790eaac08ab3fb035431ec118cae':