am 816e68e2: No-op merge from ics-mr0

* commit '816e68e2fddd56c34f864dc5647801117a51720b':