am abe0ed49: am 641a5624: Reconcile with ics-mr0-release

* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':