am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed...
am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
* commit '1c2c48cb':
Only wipe device if primary user (for failed password attempts)