Update for cdh module

Change-Id: Ia02a22d889304e4fa9f45d060bcb69d795ab268c