Merge "add explicit Base64.DEFAULT flag to request default behavior"