Merge "at_auth_unlock.py: Fix exception when using Python2 w/ non-unlock cred in directory" am: 4ee43b8c am: 003e1e7a Change-Id: I325966a8031a7cb431f775374ceb462addb52825
mentioned in commit 4889d54e