[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 157f05eb04 -s ours
am: 726b90f167
Change-Id: I4cb8f0000b765ce9b241ecda5d64c852ab547ee8
This commit is contained in: