am 37d6d98f: Reconcile with ics-mr1-release

* commit '37d6d98fe3ea739627e03b78196faba55b427503':