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

Change-Id: I93f90134618fa282ccf7c8d0e2acedf37ee41446