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

* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
  Stop long passwords crashing CryptKeeper