am 3c246e65: Reconcile with ics-mr1-release

* commit '3c246e6574ff069f0bf454e1b3a5f7e316cb80eb':