am 4f306bec: Reconcile with ics-mr1-release

* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':