Merge "improve h/w composer documentation" into ics-mr1