Merge "Update assets." into ics-mr0