S823-015
The character code in base64 encoding preceding the terminating '='
must be a multiple of 4. This change fixes situation where this
character could be any base64 character, which could happen when
one-but-last character code was a multiple of 16.
Change-Id: I9fe4fb266d07e127e9e64be9404571a91b32bcdb
