Merge "Fix a null pointer exception in ClientModeImpl" into udc-dev