am 60351eeb: am a89ee9ef: am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev

* commit '60351eebb4bf5677b4e4ca675f8fa0c6a6ee42ea':
  Avoid size_t overflow in base64 decoding once again