Fix review comments
Fix review comments

madurangasiriwardena/product-is,wso2/product-is,wso2/product-is,mefarazath/product-is,mefarazath/product-is,mefarazath/product-is,mefarazath/product-is,madurangasiriwardena/product-is,madurangasiriwardena/product-is,wso2/product-is,madurangasiriwardena/product-is,mefarazath/product-is,wso2/product-is,madurangasiriwardena/product-is,wso2/product-is