Merge "Change to fix SQLInvalidAuthorizationSpecException"

No match.