Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
am: 361a3e2090

Change-Id: Idd44b8b05758f3fd8c2e016604c0f2a10bd0b80c