am b81199b3: Merge change I885cfc23 into eclair-mr2

Merge commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11' into eclair-mr2-plus-aosp

* commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11':
  make the password-clearing algorithm smarter