fix android tenancy issue
Merge branch 'develop' of github.com:wso2-dev/product-emm into develop