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

Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea