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

Change-Id: I6064f90dcde32ccc5132fd5999224a99c7e378b0