am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev

* commit '92efd0c559d4d78880fc06544c662129fe7f6e1d':
  Revert "Avoid size_t overflow in base64 decoding once again"