Merge "EDI: Add feature version to FeatureDeviceInfo" into nyc-dev