Merge "Removal of Svg api"