Merge "Forgot to check in a header file for base64."