Merge "Removes unnecessary weak reference on the java object associated with"