Merge "Change deprecation message for enforceState methods"