Merge: Workaround bad base64 being sent by Gerrit

Change-Id: Ie15eb0636101ee0729abb5c1fc17212b3a1ac87c