am 44d7d24f: No-op merge from ics-mr0

* commit '44d7d24f97f7de13a490ec3279f07e7af7bb98a5':