Preliminary support for DU product builds [2/2]

Credit/Thanks to CM

Change-Id: I4e1e1662a4d530c32ccc0fe44b5b7ad39464d21f