am 229b77b0: am 96859329: Reconcile with ics-mr1-release

* commit '229b77b06fe7a9b4873140c281720fddb33db4b0':