am 19d01ee6: am 600298c0: Merge from ics-mr0

* commit '19d01ee6bff124e0d963d1eb3a63db3ab8008baa':