Default data update

Change-Id: I6ca90a75a2be5f1ec54ef3f224316cea771eb268
Merge "Default data update"