Fix closure compiler annotations, remove suppress