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

Change-Id: I3162421f2f3e5a6237166d200feb7f954968f9f1