Merge "Make sure mCurrentUsbFunctionsRequested flag be updated currectly"
am: 09a47331c9

Change-Id: If34a695b2a0f92b48aebbf793f562b5d5c9ad319