Merge "Make csv-core available to product and vendor am: 807969ded3 am: 1630dd25ac am: 591df89abf am: cafded5f2c am: a470db8aca"