Merge "Added empty subscription manager service"