Merge "Remove Getting device name from unlock" into qt-dev am: 0a1a4b47ec
am: 67280f3254

Change-Id: I65154a6918e86aa00e8ea0a54042903e9c77f6a4