am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev

* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
  Stop long passwords crashing CryptKeeper