Default data update

Change-Id: I7b4c0e920cd25d1a7788d2a92944105605554cef
Merge "Default data update"