am 0368527d: Reconcile with ics-mr1-release

* commit '0368527d97ffc2b771bfc34f0f1261eb7405444a':