Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 4882496232  -s ours
am: 270c4bcd86

Change-Id: I935dfed207d96aba169c6da07fa26d57781f5f93