Merge "Throw Base64DataException instead of IOException" into honeycomb