Merge "Do not pull javax.inject into features"