Merge "Specify component name for provisioning" into ics-mr0