Merge "Reorder USB_STATE updates so config_changed is not replaced." into oc-dev
am: 27e5ec0bb7

Change-Id: Id7017f4432c8b3a6471e8d12a0afead4d31639fe