Merge "Modify Component HTML changes"