Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev