am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '2d945b6a5c348953f468a2cf22254bff874d5ae1':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again