[automerger skipped] Merge "Remove unnecessary Base64 encode and decode" am:...
[automerger skipped] Merge "Remove unnecessary Base64 encode and decode" am: 3b91ed09 am: 05b8774b -s ours
am skip reason: Change-Id I9ef5578b434bdf61606dc8075363fc31988b611f with SHA-1 01016f7b is in history
Change-Id: I5e3cc9b83ff0fcb443362debeba9074bd54d2a46