Merge "Remove org.jetbrains.annotations dependency"