Merge "fix crash on invalid base64 key" into lmp-mr1-dev