Initial Data fix

Change-Id: Ic1260390453d4d93634f4f05519053e92da5eabe