Merge "Fix Cts tests that are failing due to no credential options" into udc-dev