am 5c740084: am c263b345: Reconcile with ics-mr1-release

* commit '5c74008434167b0358c6ebbd5886565d78413de0':