am 8ca8f5ed: am 40375099: Reconcile with ics-mr1-release

* commit '8ca8f5ed128cd31f0122b9d778e0dd37cb8756c9':