CM to DU changes

Change-Id: I2eca56ee0b04a1fe25576c6e1a7dff03b88e3fc7