Making data setting work for clones

Change-Id: Iff6ea00c6b7ea523868517020c53939b4b468ebd