am 8e1d9711: am 8180c9e6: Reconcile with ics-mr0-release

* commit '8e1d97112f1dd6379cc7441c8afef411b36ea146':