am 3371ce02: (-s ours) am 93c38623: am c3708121: am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev

* commit '3371ce02b725abbd5304933862fc8e02821197c4':
  DO NOT MERGE Avoid size_t overflow in base64 decoding once again