Cherry pick from master and remove unused/autogenerated files