Fix product desc and english_name.
Merge branch 'yang' into dev