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

Change-Id: Iee63263785e80cb1a893dc99204bb2fb225a497a