Default data update

Change-Id: I4082b2bdd2ac393e749c9affc0264a697aeaf396