Minor fixes to CDI section. #15240

Change-Id: Ifb573717d8a3b7ed3a4f5c5556b8536de3223c6f