[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
am: 157f05eb04 -s ours
am skip reason: subject contains skip directive

Change-Id: I33d588642ad1fb9a4820507f1ea39c9eccc0c9f8