am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN,...
am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '3f9b9f2b':
Don't wipe device because of short PIN, patterns or passwords