am 424e8787: am 91789538: Reconcile with ics-mr0-release

* commit '424e8787c958829fed7f5020f23e4a02b86d0ec4':