am 049a7882: am 3ebb3dad: Reconcile with ics-mr1-release

* commit '049a78828418c9581b2926a41633dd1b441b2ee8':