am 600298c0: Merge from ics-mr0

* commit '600298c0baf773030d726f3a18bc543af98e13d4':