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

Change-Id: Ia45c777b095ff8c29042145fd11b29dcace24366