am 37cb2f70: Reconcile with ics-mr1-release

* commit '37cb2f70392b95a3aa4f379b2e1f6baf1500af7b':