Changes for DU

Change-Id: I214f53ad4718f307d2549e79fcd1f0f452301b30