am 8971407b: Reconcile with ics-mr1-release

* commit '8971407bb512cf5256f718b49e7fc3076258e1ce':