Merge "Sync to product code" into tizen