Merge "Use javax.inject.Inject instead of com.google.inject.Inject"