Merge "Update usage of IMountService constants."