Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6