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

Change-Id: Ia288b222dd26273e7e768b58989eaa29b8652c5a