Merge "Fix the auth entry marshalling error."