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

* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
  Stop long passwords crashing CryptKeeper