Merge "Move support lib to rev 6." into ics-mr1