Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev