Merge "Update unlock code to expect token and handle in a single packet." into qt-dev am: 029a562bd8
am: 6b6bc34c47

Change-Id: I04b602669d82b1c6b9f7e8c8b1972ba673b708f9