Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
am: 89a055aa9d

Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8